More changes, plus KMP written.