some glitches fixed