diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
index 231d7f5960..97dc0a3aa3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
@@ -117,9 +117,6 @@ namespace Debugger.AddIn.Visualizers.GridVisualizer
 			Value val = null;
 			try	{
 				val = debuggerService.GetValueFromName(txtExpression.Text);
-				/*var systemObjectType = DebugType.CreateFromType(val.AppDomain, typeof(System.Object));
-				var listType = DebugType.CreateFromType(val.AppDomain, typeof(System.Collections.Generic.List<>), systemObjectType);
-				Value list = Eval.NewObject(listType	, val);*/
 			} catch(GetValueException) {
 				// display ex.Message
 			}
@@ -140,6 +137,11 @@ namespace Debugger.AddIn.Visualizers.GridVisualizer
 						var enumerableValuesProvider = new EnumerableValuesProvider(val.ExpressionTree, iEnumerableType, itemType);
 						lazyListViewWrapper.ItemsSource = new VirtualizingIEnumerable<ObjectValue>(enumerableValuesProvider.ItemsSource);
 						gridValuesProvider = enumerableValuesProvider;
+						
+						/*var systemObjectType = DebugType.CreateFromType(val.AppDomain, typeof(System.Object));
+						var listType = DebugType.CreateFromType(val.AppDomain, typeof(System.Collections.Generic.List<>), systemObjectType);
+						Value list = Eval.NewObject(listType	, val);*/
+						
 					} else	{
 						// Value cannot be displayed in GridVisualizer
 						return;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
index c6be4917e7..6bd8540f8d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
@@ -3,7 +3,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Title="Text visualizer" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" 
         MinWidth="300" MinHeight="300" MaxWidth="1000" MaxHeight="700">
-    <DockPanel>
-        <TextBox IsReadOnly="True" Name="txtText" Width="Auto" Height="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"></TextBox>
+    <DockPanel Margin="2">
+        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+            <Button Name="btnCopy" HorizontalAlignment="Left" Padding="4 2" Margin="0 4" Click="BtnCopy_Click">Copy to clipboard and close</Button>
+            <CheckBox Name="chbWrap" IsChecked="false" VerticalAlignment="Center" Margin="4 0" Unchecked="CheckBox_CheckedChanged" Checked="CheckBox_CheckedChanged">Word wrap</CheckBox>
+        </StackPanel>
+        <Border Margin="0" Padding="2">
+        <TextBox Background="White" IsReadOnly="True" Name="txtText" Width="Auto" Height="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"></TextBox>
+        </Border>
+        
     </DockPanel>
 </Window>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
index dbc725221a..7dd37b5dbc 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
@@ -40,5 +40,16 @@ namespace Debugger.AddIn.Visualizers.TextVisualizer
 			get { return this.txtText.Text; }
 			set { this.txtText.Text = value; }
 		}
+		
+		void BtnCopy_Click(object sender, RoutedEventArgs e)
+		{
+			Clipboard.SetText(txtText.Text);
+			Close();
+		}
+		
+		void CheckBox_CheckedChanged(object sender, RoutedEventArgs e)
+		{
+			txtText.TextWrapping = chbWrap.IsChecked.GetValueOrDefault(false) ? TextWrapping.Wrap : TextWrapping.NoWrap;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
index dddc84317c..53365aacb2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
@@ -356,8 +356,9 @@ namespace Debugger
 		public static Eval AsyncNewObject(DebugType debugType, List<Value> constructorArguments)
 		{
 			List<Expression> constructorArgumentsExpressions = SelectExpressions(constructorArguments);
+			// constructorArgumentsTypes = SelectTypes(constructorArguments);
 			ICorDebugValue[] constructorArgsCorDebug = ValuesAsCorDebug(constructorArguments);
-			MethodInfo constructor = debugType.GetMethod(".ctor");
+			MethodInfo constructor = debugType.GetMethod(".ctor");	// TODO
 			return new Eval(
 				debugType.AppDomain,
 				"New object: " + debugType.FullName,