Bug fixes with selective drawing