fix some cppcheck/compiler warnings & merge develop