fixed getUser bug
clarified comments/prompts
Merge branch 'hotfix'