fixing breakpoints and ignoring non-sync js
refactoring breakpoints
Merge remote-tracking branch 'origin/dev'