Bunch of changes that are probably bad because I did all this while falling asleep