version bump and tidy up