Touch up notes, add todos
Merge pull request #30 from gsarjeant/minor_cleanup

Touch up notes, add todos