Some minor changes and improvements.