improved debug
4 files changed