Updates after review of doc