Add: a minor fix and a few minor changes.