Small Changes to Command-Line Version