More kit fixes + additions. Untested kangaroo kit code.