removed some useless aliases, added new ones