updated a whole bunch