more notes fixes