reorganize, corrections to metadata