More command refactoring, still undecided.
Fix command aliases