multiple fixes to Draw function