Drawing glitches removed