Updated a whole bunch of stuff