clean up aliases, add some