key_commit: Tweaks to wip