should fix various bugs in previous commit e55e980 Running verified bricksandwich commited on 29 days ago