fix format and links