Fix escape output style for additions; fix diff to recognize more complex diff output