Code cleanup and enhancments of Words Mailmerge