Number of fixes for metadata extractor, now works with Todo.