Cleanup, rename some methods, version bump, and more