fixed major glitches