Much lies, Many fix, so code

This is the last update for real this time.  Basically this one took
care of a lot of the hidden bugs that arose when I did some silly tests.