diff --git a/Devices/Headset/CorsairHeadset.cs b/Devices/Headset/CorsairHeadset.cs
index fba3820..c754b24 100644
--- a/Devices/Headset/CorsairHeadset.cs
+++ b/Devices/Headset/CorsairHeadset.cs
@@ -2,7 +2,7 @@
 
 namespace CUE.NET.Devices.Headset
 {
-    //TODO DarthAffe 18.09.2015: Implement
+    //TODO DarthAffe 20.09.2015: Find someone to test this
     public class CorsairHeadset : AbstractCueDevice
     {
         #region Properties & Fields
diff --git a/Devices/Keyboard/CorsairKeyboard.cs b/Devices/Keyboard/CorsairKeyboard.cs
index c2c2b58..3153dea 100644
--- a/Devices/Keyboard/CorsairKeyboard.cs
+++ b/Devices/Keyboard/CorsairKeyboard.cs
@@ -118,7 +118,6 @@ namespace CUE.NET.Devices.Keyboard
                 _CorsairLedPosition ledPosition = Marshal.PtrToStructure<_CorsairLedPosition>(ptr);
                 CorsairLed led = GetLed((int)ledPosition.ledId);
                 _keys.Add(ledPosition.ledId, new CorsairKey(ledPosition.ledId, led,
-                //TODO DarthAffe 19.09.2015: Is something like RectangleD needed? I don't think so ...
                     new RectangleF((float)ledPosition.left, (float)ledPosition.top, (float)ledPosition.width, (float)ledPosition.height)));
 
                 ptr = new IntPtr(ptr.ToInt64() + structSize);
diff --git a/Devices/Mouse/CorsairMouse.cs b/Devices/Mouse/CorsairMouse.cs
index f92aa9c..e61cb05 100644
--- a/Devices/Mouse/CorsairMouse.cs
+++ b/Devices/Mouse/CorsairMouse.cs
@@ -2,7 +2,7 @@
 
 namespace CUE.NET.Devices.Mouse
 {
-    //TODO DarthAffe 18.09.2015: Implement
+    //TODO DarthAffe 20.09.2015: Find someone to test this
     public class CorsairMouse : AbstractCueDevice
     {
         #region Properties & Fields
diff --git a/Examples/SimpleDevTest/Program.cs b/Examples/SimpleDevTest/Program.cs
index 94eeae5..154b4da 100644
--- a/Examples/SimpleDevTest/Program.cs
+++ b/Examples/SimpleDevTest/Program.cs
@@ -35,7 +35,7 @@ namespace SimpleDevTest
                 if (keyboard == null)
                     throw new WrapperException("No keyboard found");
 
-                //Ink all numbers on the keypad except the '5' purple, we want that to be gray
+                // Ink all numbers on the keypad except the '5' purple, we want that to be gray
                 SimpleKeyGroup purpleGroup = new RectangleKeyGroup(keyboard, CorsairKeyboardKeyId.Keypad7, CorsairKeyboardKeyId.Keypad3)
                 { Color = Color.Purple }
                 .Exclude(CorsairKeyboardKeyId.Keypad5);
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index bdc9790..44b8888 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("CUE.NET")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("C# (.NET) Wrapper library around the Corsair CUE-SDK ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Wyrez")]
 [assembly: AssemblyProduct("CUE.NET")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyFileVersion("0.1.0")]