- some warnings fixed
#36