Minor additions and improvements