Prepare moving diff/apply to own class. See #23
removing double defined functions
adding further emits
Merge branch 'master' into TermWriter