changed TAPS pvnames and minor changes