Update: link → span; minor fixes