Cleanup, minor improvements.
Version bump