vastly improved link tracking