Comment by wuhhh

Really appreciate the time taken to dig into this with solid improvements to boot, great work