a few small changes in dmx control flow