Minor changes and improvements.