added depugger module, cleanup