Improve extracting file, dir and variable from command line.
Check all options.
Format comments.