Possibly narrowing in on Hungarian problem, some minor speedups