+ More updates to kpfgen