Lots of style fixes, more to come