metadata tidy up and links