FINAL improvements in debugging