fix breakpoint mechanism by adding explicit SourceInfo to breakpoint
calls + fix some of their output