minor cleanup

fix few things pointed out by egypt