Visual Debug Information

Fixes #1844 and #2033