Updates to latency model for new parameters and some general tidying.