small fixes from last commit (tests passing)

* PIDs are translated into pid_variables: __PID_0_58_0__