removed some glitches