Merge pull request #234 from evansb/implement-id-alg
Miscellaneous fixes

(main@2c123b9c87aeda6611a824bb5e725353f49e1312)