Remove debugger statement.
Fix binding context of event handlers.
Merge branch 'feature/bugfixes'