Cleaned up issues in Controller.c