Fixes and stylistic things