Merge pull request #35 from ArcBees/brandon_upgrades4

Brandon upgrades4
Merge pull request #34 from ArcBees/brandon_upgrades2

Brandon upgrades2
I fixed some code I overwrote on a paste earlier.