More glitches!!! (fixes)