Changes from laptop

Pushed changes to main game scene I made on Thursday