Added support for cycle delays and a few other adjustments