Refactor, fix tests, fix edge cases:

 - Catch errors when note creation/update fails
 - Add hack (wait 2 seconds) to fix bug in note feature tests.
 - Refactor some names, rip out unused code.