removed junk, fixed metadata processing