Debugger improvements, CPPI

Just read the commit logs