Lots of fixes and a new MessageFormat flag.