Small changes, trying to see where

the first-run broke AGAIN D: