More updates and improvements.