improved diagnostic info