more notes (and markup fixes)