deleted a bunch of stuff, added some stuff, and did some other stuff