More fixes and introduction of code to fix runs with pointa/pointb overlap.