some changes to exposition, flow into prior work
merge