fixed a whole bunch