general tidy up and version bump