fix formats and links