improvements in debugging