Various updates and improvements.