Metadata extractor plugin and some minor fixes

Probably. Fixed.