There are several attributes sprinkled around in these files; can you add comments to the top describing them?

I'm afraid they will get lost otherwise.