fixed more shizzles