update

a bunch of updates