Added more debugger stuff