Fixed command-line app. Moved input params.