Fix terms; add notes to some trips