style and usability tweaks
Merge pull request #7 from porjo/porjo

style and usability tweaks