add toto, notes, and correct end of lines