More tweaking argparse and scope stuff