More minor tweaks.
Support for command-line arguments.