tf listeners added; several angle corrections (not neat)