final live, links touchups and correct data