Some minor updates for clarity