Add: a few minor fixings and improvements.