more drawing fixes