fixed glitches