diff --git a/niflib.sln b/niflib.sln
index 903cdf85fdaff7faced3163c43226c4c76c9e0ea..b44f9201876a1a2474bc5c0022496c2fc0f23163 100644
--- a/niflib.sln
+++ b/niflib.sln
@@ -26,7 +26,6 @@ Global
 		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.PyNiflib|Win32.Build.0 = PyNiflib|Win32
 		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Release - DLL|Win32.ActiveCfg = Release - DLL|Win32
 		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Release|Win32.ActiveCfg = Release|Win32
-		{7517F24D-B1A1-427C-B952-F5DD5DDAD7A7}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/obj/NiTexturingProperty.h b/obj/NiTexturingProperty.h
index 3e17033c6786624c51e8ab609a9a4a6f46f21a36..0d0f95d9eb15596bb72b6312f89cc3882ef248fa 100644
--- a/obj/NiTexturingProperty.h
+++ b/obj/NiTexturingProperty.h
@@ -1,8 +1,8 @@
 /* Copyright (c) 2006, NIF File Format Library and Tools
 All rights reserved.  Please see niflib.h for licence. */
 
-#ifndef _NNiTexturingProperty_H_
-#define _NNiTexturingProperty_H_
+#ifndef _NiTexturingProperty_H_
+#define _NiTexturingProperty_H_
 
 #include "NiProperty.h"
 // Include structures
@@ -11,17 +11,17 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../gen/obj_defines.h"
 
-class NNiTexturingProperty;
-typedef Ref<NNiTexturingProperty> NNiTexturingPropertyRef;
+class NiTexturingProperty;
+typedef Ref<NiTexturingProperty> NiTexturingPropertyRef;
 
 /*!
- * NNiTexturingProperty - Describes an object's textures.
+ * NiTexturingProperty - Describes an object's textures.
  */
 
-class NIFLIB_API NNiTexturingProperty : public NI_TEXTURING_PROPERTY_PARENT {
+class NIFLIB_API NiTexturingProperty : public NI_TEXTURING_PROPERTY_PARENT {
 public:
-	NNiTexturingProperty();
-	~NNiTexturingProperty();
+	NiTexturingProperty();
+	~NiTexturingProperty();
 	//Run-Time Type Information
 	static const Type & TypeConst() { return TYPE; }
 private:	
@@ -77,13 +77,13 @@ public:
 	TexDesc GetTexture( int n ) const;
 
 	/*! Checks whether a particular texture type is being used
-	 * \param n The slot number of the texture to check.  This is a positive zero based index that must be less than the value returned by NNiTexturingProperty::GetTextureCount.
+	 * \param n The slot number of the texture to check.  This is a positive zero based index that must be less than the value returned by NiTexturingProperty::GetTextureCount.
 	 * \return true if the texture in this slot is used, false otherwise.
 	 */
 	bool HasTexture( int n ) const;
 
 	/*! Clears a specific texture slot.
-	 * \param n The slot number of the texture to clear.  This is a positive zero based index that must be less than the value returned by NNiTexturingProperty::GetTextureCount.
+	 * \param n The slot number of the texture to clear.  This is a positive zero based index that must be less than the value returned by NiTexturingProperty::GetTextureCount.
 	 */
 	void ClearTexture( int n );
 
diff --git a/obj/NiTimeController.cpp b/obj/NiTimeController.cpp
index e6629c3010209c869e6b03b05c674c933c88f7f5..6e7380008e85e0cfc928530b27a41a0fc7513c6f 100644
--- a/obj/NiTimeController.cpp
+++ b/obj/NiTimeController.cpp
@@ -50,3 +50,43 @@ void NiTimeController::SetTarget( NiObjectNET * new_target ) {
 Ref<NiObjectNET> NiTimeController::GetTarget() {
 	return target;
 }
+
+ushort NiTimeController::GetFlags() const {
+	return flags;
+}
+
+void NiTimeController::SetFlags( ushort n ) {
+	flags = n;
+}
+
+float NiTimeController::GetFrequency() const {
+	return frequency;
+}
+
+void NiTimeController::SetFrequency( float n ) {
+	frequency = n;
+}
+
+float NiTimeController::GetPhase() const {
+	return phase;
+}
+
+void NiTimeController::SetPhase( float n ) {
+	phase = n;
+}
+
+float NiTimeController::GetStartTime() const {
+	return startTime;
+}
+
+void NiTimeController::SetStartTime( float n ) {
+	startTime = n;
+}
+
+float NiTimeController::GetStopTime() const {
+	return stopTime;
+}
+
+void NiTimeController::SetStopTime( float n ) {
+	stopTime = n;
+}
diff --git a/obj/NiTimeController.h b/obj/NiTimeController.h
index 926b772749bdbf5ceb1b7ae02384ad6889ebb74d..21955bd9c394c0bc6493c06b3f4eb5924c7377fe 100644
--- a/obj/NiTimeController.h
+++ b/obj/NiTimeController.h
@@ -36,28 +36,46 @@ public:
 	virtual list<NiObjectRef> GetRefs() const;
 	virtual const Type & GetType() const;
 
-	/*! Returns a reference to the next controller in a linked list.
+	/*! 
+	 * Returns a reference to the next controller in a linked list.
 	 * This function should only be called by NiObjectNET.
 	 * \return A reference to the next controller in the linked list.
 	 */
 	NiTimeControllerRef GetNextController() const;
 
-	/*! Sets the next controller in a linked list.
+	/*! 
+	 * Sets the next controller in a linked list.
 	 * This function should only be called by NiObjectNET.
 	 * \param obj A reference to the object to set as the one after this in the chain.
 	 */
 	void SetNextController( const NiTimeControllerRef & obj );
 
-	/*! This function should only be called by NiObjectNET.  It sets the target of
+	/*! 
+	 * This function should only be called by NiObjectNET.  It sets the target of
 	 * this controller when it is attatched to the NiObjectNET class. */
 	void SetTarget( NiObjectNET * new_target );
 
-	/*! This function returns the current target NiObjectNET, if any, that this controller
+	/*! 
+	 * This function returns the current target NiObjectNET, if any, that this controller
 	 * is acting on.
 	 * \return A reference to the current target of this controller.
 	 */
 	Ref<NiObjectNET> GetTarget();
 
+	ushort GetFlags() const;
+	void SetFlags( ushort n );
+
+	float GetFrequency() const;
+	void SetFrequency( float n );
+
+	float GetPhase() const;
+	void SetPhase( float n );
+
+	float GetStartTime() const;
+	void SetStartTime( float n );
+
+	float GetStopTime() const;
+	void SetStopTime( float n );
 protected:
 	NI_TIME_CONTROLLER_MEMBERS
 };