Add: a few minor improvements.