Fixed merge, cleaned Text Debugger