started working on a fix for some funky breakpoint shifting issues