Paul-Olivier Dehaye templates, minor typos, consistency of macros