Better arguments

And better iterating over files.