Drawing improvements