Additional testing and improvements.