some improvements in performance
and some more performance improvements
speed up link update