Small tweaks. Args still need fixing but argparse sucks