fixed a few concurrentmodificationexceptions in drawablehandler