changed/added a bunch of stuff