Minor changes to debugging and formatting.