config and cli arg overhaul