added a bunch of stuff, I guess