Design fixes
Various fixes and improvements
Merge branch 'fixes' into some-fixes
Merge pull request #461 from dswd/some-fixes

Some fixes