Simplified EOF handling in force_matching and fixed estimated completness