should fix various bugs in previous commit e55e980 Running verified bricksandwich commited on Feb 13, 2025