Improvements for usage
Bugfix
Improvements and bugfixes
argparse not essential