better xref
assorted stuff