added some status controls to the Delivery
got all the test almost back to working state