added more messages, added more to multi-file, multi-file breaks:field not found: Content