fix glitches