updated a bunch of things