improvements to target generation including versioning