rename functions to sort better
tidying things up and adding a few things for the modsim paper