Cosmetic and comments fixes.