Added some attribs that were used in databases but not in this file. More to come. Plus general tidying up