Add enhancements for debug and future development #867

Closed calvinaco closed 11 months ago