Add in a few missing doc comments, fix up other things.