Improvements to our debugger