updating github ahead of major changes - main.py only has small changes

We really need to go through main.py again, do all the little things we did last time and make sure I understand the whole thing.