Revert "Revert "Some text changes from JB""

This reverts commit 499c085d6b7c520228311a1c3124a8a6126bfabd.