merged with main.py edits, minor things and removed unnecessary code and comments