Final fix ups. Version bump.