Cleanup and version number up'd.