TSAGE: Bugfixes and renaming for R2R cell and surrounds