main.py arguments support
code review and few changes