Add: a few minor improvements and fixings.