extensive changes to KORE -- all tests pass again