Some drawing updates