big fixes : remote and PID