more command line changes/bug fixes.