Tidy up and minor updates