Fixed some issues with the Economy.

I'm nervous that the economy is going to keep me busy for a long time.