A handful of metadata updates to fix Ed's last commit

Should be working as expected now.

-E