Tweaks and version bump