Incorporated Francois' suggestions.