more aliases and clean up