Cleaned up a bit. Removed the --output-dir option.