enhancements to debug capability