Fix some controller bugs

Fix some controller bugs
Merge pull request #21 from lanblue/Fix_Controller_Bugs

Fix some controller bugs