fixed few warnings and extra code