Simpler note creation.  Fix note save bug.
Merge branch 'note-creation'

* note-creation:
  Simpler note creation.  Fix note save bug.