Improvement on link tracker;
Minor changes