cosmetics and some warning fixes