More comments. Fixes.