Make notes.org killable, move macros into cb-macros