minor restructuring, added rework notes