bug fixes + removal of breakpoints