added breakpoint macro and other fixes