Improved theWord export and testing and small bug fixes