fixed errors in controllers
Merge pull request #11 from jpark3000/controller_stuff

fixed errors in controllers