Controller: Small code fixes before merge
Merge branch 'controller' of github.com:GOAAAT/tuningcomplete into controller