get the version tags right; clean up