Fixes to TWR calculations

Well figures.