Changed some variables, fixed broken stuff

Last commit for a while, thank the lord.