diff --git a/Assets/Editor.meta b/Assets/Editor.meta
new file mode 100644
index 0000000..99af185
--- /dev/null
+++ b/Assets/Editor.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: 7ca61b636d47bab49b3f0934f5f0a8f6
+folderAsset: yes
+DefaultImporter:
+  userData: 
diff --git a/Assets/Scripts/ThirdPersonCameraEditor.cs b/Assets/Editor/ThirdPersonCameraEditor.cs
similarity index 100%
rename from Assets/Scripts/ThirdPersonCameraEditor.cs
rename to Assets/Editor/ThirdPersonCameraEditor.cs
diff --git a/Assets/Scripts/ThirdPersonCameraEditor.cs.meta b/Assets/Editor/ThirdPersonCameraEditor.cs.meta
similarity index 100%
rename from Assets/Scripts/ThirdPersonCameraEditor.cs.meta
rename to Assets/Editor/ThirdPersonCameraEditor.cs.meta
diff --git a/Assets/Scripts/CharacterControllerLogic.cs b/Assets/Scripts/CharacterControllerLogic.cs
index 8f90155..de35a79 100644
--- a/Assets/Scripts/CharacterControllerLogic.cs
+++ b/Assets/Scripts/CharacterControllerLogic.cs
@@ -209,7 +209,7 @@ void FixedUpdate()
 			capCollider.height = capsuleHeight + (animator.GetFloat("CapsuleCurve") * 0.5f);
 			if (gamecam.CamState != ThirdPersonCamera.CamStates.Free)
 			{
-				gamecam.ParentRig.Translate(Vector3.up * (transform.position.y - oldY));
+                gamecam.transform.Translate(Vector3.up * (transform.position.y - oldY));
 			}
 		}
 	}
diff --git a/Assets/Scripts/ThirdPersonCamera.cs b/Assets/Scripts/ThirdPersonCamera.cs
index 214e4cc..c3f6559 100644
--- a/Assets/Scripts/ThirdPersonCamera.cs
+++ b/Assets/Scripts/ThirdPersonCamera.cs
@@ -21,8 +21,10 @@
 /// </summary>
 using UnityEngine;
 using System.Collections;
-using UnityEditor;
 
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 
 /// <summary>
 /// Struct to hold data for aligning camera
@@ -233,6 +235,7 @@ void Update ()
 		
 	}
 	
+    #if UNITY_EDITOR
 	/// <summary>
 	/// Debugging information should be put here.
 	/// </summary>
@@ -243,6 +246,7 @@ void OnDrawGizmos ()
 			DebugDraw.DrawDebugFrustum(viewFrustum);
 		}
 	}
+    #endif
 	
 	void LateUpdate()
 	{