More changes w/r/t handling settings/data path.