A few changes to improve the Serial output for debugging.