Big fixes

Controller bug fixes
No more underscore

:-1:
Comments and bugfixes