some re-org of notes, and xrefs