improved debugging support