fixes and formatting