Add edit option, fix some errors
Merge branch 'master' of https://github.com/isamert/addalias