added some aliases and some other stuff