changed stuff, mostly just broke more things