Added some improvements to debugger.