Fixed collision and better integration between drawing and events system