reorganized aliases, removed a few, added a few