fix some drawing issues