More fixed; still testing.