Changed a bunch of stuff, nothing worth noting yet