better debug support