Added some telemetry monitoring and cleaned some stuff up