style fixes and minor details