switch to aliases
minor things
other minor things