Minor adjustments in TAPS.opi