Some corrections / tidy up