Bug Fixes for the Coming Morn

I went through it and changed a whole bunch of bugs.  It is now as near
perfect as possible, as far as I can tell.