main.py bugs fixed after merge