More changes before you start proof reading

here is some more stuff which was sitting in another pull request