Fix comment expand/contract

Use a seperate identifier to expand/contract comments
and make it mostly 508 compliant.