Design tweaks

Fixing a bunch of tiny stuff that isn't worth separate pull requests... see commits for details!