Lots of style fixes, lots more still to do...