Minor enhancements
Add debugging code.