Some further tidy ups
- added missing files from previous commits