Fixed some glitchy glitches