improved diagnostic output