error handling, small bugs
Merge branch 'master' of https://github.com/earllee/notegenie