Hane pushed to main at Hane/tmr

Hane
Fri, 21 Jul 2023 19:32:06 +0000

64727ac2794d6dcb43743f731c12ff2f88d34dde minor fixes discovered during actual impl