fix and add some text and links