some minor changes, now link titles.