minor tweaks and changes to support crest links