Some debugging and text changes