Minor tweaks - but mostly debugging
Added the debugger module