Merge pull request #846 from SlexAxton/meta

Take data out of comments and put it into data blocks up top.
Might as well add these.