Minor additions and improvements.