Error Fixing

And with 1,700 lines of rewriting, many errors occurred.  Now, as far as
I can tell, they're fixed!