some more small fixes

fixed some warnings - don't like them :)
also some more cleanup