Fixes and some style conformity changes