finished  order controller and minor bug fixes