Add: a few fixings and improvements.