Changed bug drawing fixes to make more sense.