General commit: new order fixes (some still in progress)