Some changes and notes from code review.