improvements for debbugging