Added some aliases and a bugfix