Lengthen timeout; ignore messages with filenames. Allow overriding location of input file. Fix unmerged component.