perform some clean ups and add some additional metadata