more fixes to the new notes impl