PAHMA-979: tweaks to debugging and clarity of output