tidying up and adding some new aliases & options