Rewritten file list handling, proper cmd