Good point. Branching now to test these suggestions.