Minor changes to prevent negative input on command line