fixed more FF glitches