some drawing fixes. raw