Changes made as suggested on S/O. While better, still not any luck. I'll try again next weekend.