working, tests good, many xml fixes, word templates