Cleaned up a bit. B4 change: v_aug_pt to v_aug_pts
Renamed some variables