General tidying + version bump.