Tidy up and added missing data