fixing glitches found