minor interface tweaks, bug fixes
Merge branch 'master' into styling