It used to be that 640 mineral income was a fully-saturated base. Now it's 896.
Everyplace in the system that uses 640 and multiples of 640 should be updated. For example:
http://ggtracker.com/economy_stats#?race=protoss&vs_race=zerg
And the parallel changes should be made for gas.
And all the same goes for TheStaircase-related code.