Add: various minor improvements and fixings.