fixed bad merging of tradeEngine, and reverted back on signalGenerator