Made a bunch of changes

no more herp derp