General updates and improvements.