a bunch of updates :(