Orders:several fixes