Renamed some things and made some corrections (I'm an idiot)