fixed a couple of compiler warnings
merged couple of small things

Merge branch 'compiler_warnings' into improvement