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