fixes from comments
Merge pull request #3 from abaran/client-app

fixes from comments