Still fixing glitches