whole bunch of updates, ugh...