various changes to make account#match_working_orders work