Plugged a few holes with debugging dumps.