several glitches fixed