More dev on new models, mainly tidying