Improved filetype detection
Improvements to PSImporter