Bunch o' fixes

Many bug fixes and improvements to UX.