Version bump, some cleanup.