more pause/resume/order fixes