Fix comment and argparse decription
Update comments and messages