another update

Based on more feedback, went back into this one for another round of tightening up and changes.