Adding modes, cleaning up command line helper.