Added autofarm and upgrades. Bit of cleaning up.