fold_back option to be retired (is redundant); minor changes