Doc updates

With discussed changes.