some drawing fixes