many notes, fixes