Add: a few minor fixings and changes.