Correct user approval and use better error messages
Correct some simple stuff as pointed out in the pull request comments