Comment and debug-print improvements.