TSAGE: Bugfixes and renaming for entering ARM hanger, and more for Spill Mountains