added more aliases and things