Some additions to testing, comments, and a typo of sort.