Corrected tan and bitan calculation

But they are still incoherent when UV is "reversed"