Cosmetic changes & debugging output.