Fix a number of problems...  It was supposed to be 2 commits, and the
2nd commit nearly caused me to blow a head-gasket, therefore, I won't
try to explain the problem...