Oddly enough, I have been teaching and writing since exiting school to be a programmer. On topic, I suggested the UI offer something similar to the policy that lets you gain influence per turn from a trade route to a CS. I believe you said before that these game mechanics for policies are located in a different format from those of the buildings and thus it was not easy to convert a game mechanic from one to the other. What format are improvements in, and do they share similarities with anything else? Is the reason why you don't want reworks is because of the workload involved for you personally? If you were to receive help with doing a rework, would it be on the table?