Some cleanups and startting up with telemetry.