Edit debugger class & fix bug