removed unnecessary stuff, added a bunch of stuff