fixes and design updates