updated a bunch of stuff