Minor changes

Also figured out where the first-run error is stemming. See comment
starting at line 185