Fixed print statements, tidied up argparse