Remaining metadata

Completes #10