finished first pass at incorporating review feedback. Very few problems remain