attempt to fix buggy answer editing
updated notes
Merge branch 'fixes'