Code review comments from Tom. Needs another review