style fixes and things that make sense