fixed some drawing issues