Kethane 0.6 compatibility

Lots of changes, read commit notes