Loads of changes

Most of them very small - probably...