Several glitches fixed