updated links and names