Minor variable renaming to stress mutability.
Add some debug printouts for fix features.  Increase tolerances to get past getting stuck.