Add some aliases and clean up some config