cyclone_debug improvements pt. 2