tidy up, add a couple of new models