Small changes cleaning up code and APIs
Recompile with khepri V0.7