Fixed some more issues.
Removed misc prints and renamed some error messages.
Merge branch 'master' of github.com:bearbin/petulant-lana