Fixes and design