glitches fixed