Once I submitted the "fixed" version, they responded back late last night with this:
"Thank you! Really good job. And a fast turn around. I like this far better. I like it enough to offer you a contract on it."I am expecting them to get me the contract today!
This is truly a "Happy Day!"