Correct file descriptions
Correct header-protecting conditionals
Correct file descriptions (in the detail)
Other comment corrections
Automated rewrite (not filenames yet)