More tweaks and version bump