link and comment fix