Integrated telemeters

Integrated telemeter (but not tested !)
Minor cleanup