added a bunch of stuff lol