Controller bug fixes & optimisations
Merge branch 'master' of github.com:Xenapto/xendata