Added cancel order option

an a few other minor changes