Found lots more bugs and fixed them. It is like a bottomless pit of
error correction.