Fixed glitch when leaving breakpoint mode

Plus some other minor updates