updated whole bunch of shizzle