More metadata fixing. Should be ready now.