fixes and design changes