TODO for note save; fixed bug in canonicalizer