fixes for a number of style issue