Update, fix and remove links