Numerous minor updates from code review.