Fixed a mess of stuff.  Still not ready for prime time.