Changes to CapAndTradeConsole, CapAndTradeSimulation, Controller