tangent added; defined Angle and Triangle