Cosmetic changes, some extra debug to STDERR.
--Tim