Update metadata and clean up a bit. [admin]
Just general improvements.