Improved debug

crutch for what?