Touch up charging logic and version bump.