updated a whole bunch of stuff