some glitches removed