Add some comments, make some minor updates.