comment headers fixed