Sub-Flight benchmarking debug code
Boring changes