V2.2, updated to khepri-ast V4.4, cleaning up code a bit