small fixes and blank order controller