Minor usability tweaks, including simple command line arguments