added some stuff for diagnostics
2 files changed