Change linking method and fix minor typographical errors