all refactor-bags fixed -- again