More filetypes covered (copied from TOM_RUS release), fixed CLI arguments