Improved debug script(s)