added some aliases and stuff