diff --git a/ANX.Framework/Graphics/EffectAnnotationCollection.cs b/ANX.Framework/Graphics/EffectAnnotationCollection.cs
index d726427a..0a70c6d1 100644
--- a/ANX.Framework/Graphics/EffectAnnotationCollection.cs
+++ b/ANX.Framework/Graphics/EffectAnnotationCollection.cs
@@ -14,7 +14,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.InProgress)]
     public sealed class EffectAnnotationCollection : IEnumerable<EffectAnnotation>
     {
diff --git a/ANX.Framework/Graphics/ModelBoneCollection.cs b/ANX.Framework/Graphics/ModelBoneCollection.cs
index a1337c1b..51971d65 100644
--- a/ANX.Framework/Graphics/ModelBoneCollection.cs
+++ b/ANX.Framework/Graphics/ModelBoneCollection.cs
@@ -14,7 +14,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("???, AstrorEnales")]
+    [Developer("Glatzemann, GinieDP, AstrorEnales")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public sealed class ModelBoneCollection : ReadOnlyCollection<ModelBone>
     {
diff --git a/ANX.Framework/Graphics/RasterizerState.cs b/ANX.Framework/Graphics/RasterizerState.cs
index 0ddb3143..0da56a4a 100644
--- a/ANX.Framework/Graphics/RasterizerState.cs
+++ b/ANX.Framework/Graphics/RasterizerState.cs
@@ -10,7 +10,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
 	[PercentageComplete(100)]
-    [Developer("AstrorEnales, Glatzemann")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Untested)]
 	public class RasterizerState : GraphicsResource
 	{
diff --git a/ANX.Framework/Graphics/RenderTargetCube.cs b/ANX.Framework/Graphics/RenderTargetCube.cs
index 80593867..6a01d8a4 100644
--- a/ANX.Framework/Graphics/RenderTargetCube.cs
+++ b/ANX.Framework/Graphics/RenderTargetCube.cs
@@ -9,6 +9,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
 	[PercentageComplete(0)]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Untested)]
 	public class RenderTargetCube : TextureCube, IDynamicGraphicsResource
 	{
diff --git a/ANX.Framework/Graphics/RenderTargetUsage.cs b/ANX.Framework/Graphics/RenderTargetUsage.cs
index 1bc65604..2c3d8890 100644
--- a/ANX.Framework/Graphics/RenderTargetUsage.cs
+++ b/ANX.Framework/Graphics/RenderTargetUsage.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum RenderTargetUsage
     {
diff --git a/ANX.Framework/Graphics/SetDataOptions.cs b/ANX.Framework/Graphics/SetDataOptions.cs
index 2851673b..91948ce3 100644
--- a/ANX.Framework/Graphics/SetDataOptions.cs
+++ b/ANX.Framework/Graphics/SetDataOptions.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SetDataOptions
     {
diff --git a/ANX.Framework/Graphics/SpriteBatch.cs b/ANX.Framework/Graphics/SpriteBatch.cs
index c8e88330..b90acf29 100644
--- a/ANX.Framework/Graphics/SpriteBatch.cs
+++ b/ANX.Framework/Graphics/SpriteBatch.cs
@@ -12,7 +12,7 @@ namespace ANX.Framework.Graphics
 {
 	[PercentageComplete(100)]
 	[TestState(TestStateAttribute.TestState.Untested)]
-	[Developer("Glatzemann, AstrorEnales")]
+	[Developer("Glatzemann")]
     public class SpriteBatch : GraphicsResource
 	{
 		private const int InitialBatchSize = 1024;
diff --git a/ANX.Framework/Graphics/SpriteEffects.cs b/ANX.Framework/Graphics/SpriteEffects.cs
index d9a3f896..a212e8c1 100644
--- a/ANX.Framework/Graphics/SpriteEffects.cs
+++ b/ANX.Framework/Graphics/SpriteEffects.cs
@@ -9,7 +9,7 @@ namespace ANX.Framework.Graphics
 {
     [Flags]
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SpriteEffects
     {
diff --git a/ANX.Framework/Graphics/SpriteInfo.cs b/ANX.Framework/Graphics/SpriteInfo.cs
index e84972c8..deca07e1 100644
--- a/ANX.Framework/Graphics/SpriteInfo.cs
+++ b/ANX.Framework/Graphics/SpriteInfo.cs
@@ -1,4 +1,8 @@
+#region Using Statements
 using System;
+using ANX.Framework.NonXNA.Development;
+
+#endregion
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -6,6 +10,9 @@ using System;
 
 namespace ANX.Framework.Graphics
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
+    [Developer("Glatzemann")]
     internal struct SpriteInfo
     {
         public Vector2[] Corners;
diff --git a/ANX.Framework/Graphics/SpriteSortMode.cs b/ANX.Framework/Graphics/SpriteSortMode.cs
index 5f1895eb..c8cb55c0 100644
--- a/ANX.Framework/Graphics/SpriteSortMode.cs
+++ b/ANX.Framework/Graphics/SpriteSortMode.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SpriteSortMode
     {
diff --git a/ANX.Framework/Graphics/StencilOperation.cs b/ANX.Framework/Graphics/StencilOperation.cs
index bacc0656..d7f5128b 100644
--- a/ANX.Framework/Graphics/StencilOperation.cs
+++ b/ANX.Framework/Graphics/StencilOperation.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
 	public enum StencilOperation
 	{
diff --git a/ANX.Framework/Graphics/SurfaceFormat.cs b/ANX.Framework/Graphics/SurfaceFormat.cs
index 41a36f2b..309babe9 100644
--- a/ANX.Framework/Graphics/SurfaceFormat.cs
+++ b/ANX.Framework/Graphics/SurfaceFormat.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum SurfaceFormat
     {
diff --git a/ANX.Framework/Graphics/TextureCube.cs b/ANX.Framework/Graphics/TextureCube.cs
index a8b53c48..cc8a6c98 100644
--- a/ANX.Framework/Graphics/TextureCube.cs
+++ b/ANX.Framework/Graphics/TextureCube.cs
@@ -8,7 +8,8 @@ using ANX.Framework.NonXNA.Development;
 
 namespace ANX.Framework.Graphics
 {
-	[PercentageComplete(0)]
+	[PercentageComplete(10)]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Untested)]
 	public class TextureCube : Texture, IGraphicsResource
 	{
diff --git a/ANX.Framework/Graphics/TextureFilter.cs b/ANX.Framework/Graphics/TextureFilter.cs
index 441975ce..4615d26a 100644
--- a/ANX.Framework/Graphics/TextureFilter.cs
+++ b/ANX.Framework/Graphics/TextureFilter.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum TextureFilter
     {
diff --git a/ANX.Framework/Graphics/VertexElementFormat.cs b/ANX.Framework/Graphics/VertexElementFormat.cs
index ef4303e8..cd0c3ee4 100644
--- a/ANX.Framework/Graphics/VertexElementFormat.cs
+++ b/ANX.Framework/Graphics/VertexElementFormat.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum VertexElementFormat
     {
diff --git a/ANX.Framework/Graphics/VertexElementUsage.cs b/ANX.Framework/Graphics/VertexElementUsage.cs
index cd919075..cbcc233e 100644
--- a/ANX.Framework/Graphics/VertexElementUsage.cs
+++ b/ANX.Framework/Graphics/VertexElementUsage.cs
@@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
 namespace ANX.Framework.Graphics
 {
     [PercentageComplete(100)]
-    [Developer("AstrorEnales")]
+    [Developer("Glatzemann")]
     [TestState(TestStateAttribute.TestState.Tested)]
     public enum VertexElementUsage
     {
diff --git a/build/MakeAnxFramework.cmd b/build/MakeAnxFramework.cmd
index 18a21f58..b9de3528 100644
--- a/build/MakeAnxFramework.cmd
+++ b/build/MakeAnxFramework.cmd
@@ -3,23 +3,33 @@ setlocal
 set ProgRoot=%ProgramFiles%
 if not "%ProgramFiles(x86)%" == "" set ProgRoot=%ProgramFiles(x86)%
 
-if EXIST "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" goto vs2011
-if EXIST "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" goto vs2010
+FOR /F "tokens=2* delims=	 " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\11.0_Config" /v ShellFolder') DO SET vs11dir=%%B
+FOR /F "tokens=2* delims=	 " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\10.0_Config" /v ShellFolder') DO SET vs10dir=%%B
+
+if EXIST "%vs11dir%\vc\vcvarsall.bat" goto vs2011
+if EXIST "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" goto vs2011pf
+if EXIST "%vs10dir%\vc\vcvarsall.bat" goto vs2010
+if EXIST "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" goto vs2010pf
 goto error_msg
 
+:vs2011pf
+  SET vs11dir = %ProgRoot%\Microsoft Visual Studio 11.0\
 :vs2011
   echo Visual Studio 2011 build environment
-  call "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" x86
+  call "%vs11dir%\vc\vcvarsall.bat" x86
   SET ENV=VS2011
   goto start_nant
 
+:vs2011pf
+  SET vs10dir = %ProgRoot%\Microsoft Visual Studio 10.0\
 :vs2010
   echo Visual Studio 2010 build environment
-  call "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" x86
+  call "%vs10dir%\vc\vcvarsall.bat" x86
   SET ENV=VS2010
   goto start_nant
 
 :start_nant
+if NOT EXIST "../build" goto error_msg_working_dir
 set PATH=../lib/nant-0.91/bin;../Tools/bin;%PATH%
 
 if "%1"=="" (
@@ -34,6 +44,11 @@ goto pause
 
 :error_msg
 echo Couldn't find Visual Studio 2010 or 2011. Exiting.
+goto pause
+
+:error_msg_working_dir
+echo Please start MakeAnxFramework from the build directory. (use CD to change directory)
+goto pause
 
 :pause
 pause
\ No newline at end of file