Optimzed Breakpoint

+ Some minor changes
Merge branch 'dev'