Small changes

Mostly aestetic, some warnings fixed.