add some aliases and other