Simplified system and fixed a few bugs with error handling
Added simplification change to trade