Various minor updates and improvements.