New File filter, and other small changes.
Merging with Cameron.