Tag Improvements

don't merge yet; more commits to follow..