Adds better aliases and fixes prompt