more FS mappings drafted
merged with morphfs changes