Waffling

Minor work.  Code cleanup, tried to fix some error messages.