non-perturbative link addition, style/performance improvements