I've got more changes.
The Fixes.user file still had an old way of doing Skilled City-Dweller I forgot to delete:
cvCityDwel in the Class Variants page
Here is the new way (Adjustments) and there only needs to be four adjustments to handle all classes (because you select the class):
http://heathers.stdio.com/~risner/Fixes2.user