update_fix: move best effort update to new module, refactor