Pulled together some general edits and started work on the metadata