Continued work on debug scripts