Small bug fixes in Main.py and improved command line ease of use.