fixes and breakpoints