Add: various minor fixings and improvements.