Improved output and debug information