version bump, code cleanup.