minor model tidying
merging remote changes