merged work on alias command, fixed formatting