Changes made during tech fair

All of the changes we made during the tech fair should be here.