Fixes and formatting