style fixes and such