cleanup of the version .2, getting ready for version .3