Add some comments. A few minor fixes.