Fixed an issue where incorrect files were being parsed.
More args changes.