Minor correction and improvements.