Various changes and improvements.