Doc update

Update based on Roberto's suggestions