usability fixes based on Laurie and Rod's feedback.
Merge pull request #6 from bcoe/usability-fixes

usability fixes based on Laurie and Rod's feedback.