tidied up and a few extra aliases added