Some improvements to draw