final commit from me

addressed some of the Todos and did a little bit of cleanup and
proofing.