Bettertesting

Alex, incorporated your suggestions (which I greatly appreciate - as well as the info behind them)

Let me know if this looks better/ready to pull or needs more attention.   Thanks!
in that case, we should probably fix it the right way.  I'm out tomorrow but first thing Monday I can check out the lead-types and give that a stab and test for it here.