various tiny style fixes