fixed 2 glitches