new note, old fixes
Merge branch 'dev'