Noted, doing that + benchmarks and some cleanup tonight.