adding some aliases and removing others
fixing conflicts
re-adding mouse a