Changed a bunch of stuff, emergency backup