Add a bunch to main.py
Change/add logging and arguments