TSAGE: Bugfixes and renaming for R2R desert