additional round of tweaks... adding in links @context and shims