Updated version of white paper

More labeling of tools and a variety of improvements to align
recommendations and timeline