order_edit tweaks, first version - need to improve