Better debug printouts
Fixups