more verbose error
Merge branch 'master' of https://github.com/insanity54/dawan
updated todos, fixed alias map bug