Fixes and formatting.