shorten some refs, enriched others