Lots of changes including implementation of revised metadata.