Tidied up model content and expanded locations so they make sense together