comment tweaks, no real change
remove most commented-out debug printfs