Added and changed a whole bunch of stuff