Add missing messages fail/error
Implement validation to Word and XML export
Resolve merge conflicts