significant safety improvements and additional filetypes