Resolved comments from David Foster.

Fixed a couple more tidbits.