improvements in debug