More work on notes. Make it crash less.