Added some more metadata fields.

- still need to tidy this code up.