fixed metadata and stuff