Several tweaks from user feedback
Merge pull request #245 from kimardenmiller/user-feedback-fixes

Several tweaks from user feedback