lots of style fixes