add fs.default.name
merged brads cleanup