Angle resolved his issues with WWE. It was down to him anyway since he asked for his release after he refused to go to rehab. He's already stated he's happy ending his career in TNA, though.
The Undertaker wanted to lose to Kane at their first WrestleMania meeting but it wasn't allowed.