Improved the debugger functionality after the input from Rohit (QA)