clean up for nfjs magazine article.
lots of changes
cleanup
cleaned merge conflicts.