more refinements to breakpoints, etc, starting to incorporate new psds