Tweaks on Algorithm

Almost have it all fixed during processing.  Need to test.