making changes to fit my setup as well as adding a few extra aliases