add NotesHandler; some other updates