Adding breakpoint, plus a number of fixes.