Many changes, per review w/Sue

Lots of changes!