Corrected some bugs with OrderController