More improvements to Draw