Tweak to CLI, added deporder to --production