Comments, some minor fixes.