notes fixes
Merge branch 'feature-notes' into feature-all