more work on header comment parsing