some style fixes and post update