Final tidy up
further patches