Debugger is back, some changes