Add: various fixings and improvements.