Add a few comments, minor reorg.

Reorganized and shuffled around a few of the comments for the data definitions. Also fixed an error.