JB suggestions

When I send you my comments, you'll get more information on what I've done here.