more cleanup, new breakpoints