- added support for stdin.
- cleaned up the cmdline arguments for expanded and expanded2..