Nonsubstantive bugfixes, and a TODO section.