local echo fix
Improved debug messages