some controller and debug changes
Merge github.com:nabble/ajde into ajde