TSAGE: Cleanup and fixes for R2R ring edge