fix one last holdout with the same bug
refactoring a bunch