Updated doc comments per comments on #801
Updated docs with recent changes