Added more aliases and fixed some