diff --git a/include/obj/NiObject.h b/include/obj/NiObject.h
index 31bc746dab8d213304946734117d0178592eccd2..a23766baa262302ba7f0c8a71b74a246b444ecbe 100644
--- a/include/obj/NiObject.h
+++ b/include/obj/NiObject.h
@@ -108,7 +108,7 @@ public:
 	 * Formats a human readable string that includes the type of the object
 	 * \return A string in the form:  address(type)
 	 */
-	NIFLIB_API virtual string GetIDString();
+	NIFLIB_API virtual string GetIDString() const;
 
 	/*!
 	 * Used to retrieve all blocks that the current block is linked to through <i>all</i> attributes.
diff --git a/src/niflib.cpp b/src/niflib.cpp
index 80f4de7ecc708b1d958629bf262159c318747eb0..3f1e27bdfb5c2a52e1a6682cc67654ef37dc0f71 100644
--- a/src/niflib.cpp
+++ b/src/niflib.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 //#define DEBUG // this will produce lots of output
-//#define PRINT_OBJECT_NAMES
+#define PRINT_OBJECT_NAMES
 //#define PRINT_OBJECT_CONTENTS
 //#define DEBUG_LINK_PHASE
 //#define DEBUG_HEADER_FOOTER
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index a1c92d8e88ef40109baef1fc0dc79fc08b80fe6f..7bdd567cdadfe27a08afcc7c2efd3a58d4df744f 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -87,7 +87,9 @@ void NiNode::RemoveChild( Ref<NiAVObject> obj ) {
 
 void NiNode::ClearChildren() {
 	for ( vector< NiAVObjectRef >::iterator it = children.begin(); it != children.end(); ++it) {
-      if (*it) (*it)->SetParent(NULL);
+		if ( *it != NULL ) {
+			(*it)->SetParent(NULL);
+		}
 	}
 	children.clear();
 }
@@ -138,17 +140,12 @@ void NiNode::AddSkin( NiSkinInstance * skin_inst ) {
 }
 
 void NiNode::RemoveSkin( NiSkinInstance * skin_inst ) {
-	//Unflag any bones that were part of this skin instance
-	vector<NiNodeRef> bones = skin_inst->GetBones();
-	for ( uint i = 0; i < bones.size(); ++i ) {
-		bones[i]->SetSkinFlag(false);
-	}
-	
 	//Remove the reference
 	skins.remove( skin_inst);
 
 	//Ensure that any multiply referenced bone nodes still
 	//have their skin flag set
+	vector<NiNodeRef> bones;
 	for ( list<NiSkinInstance*>::iterator it = skins.begin(); it != skins.end(); ++it ) {
 		bones = (*it)->GetBones();
 		for ( uint i = 0; i < bones.size(); ++i ) {
diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp
index e475ed56feffde8db94ec2a3c64c475b470e8aa3..d2f8b3e23539a82eb123f63996ad3160b3478fa2 100644
--- a/src/obj/NiObject.cpp
+++ b/src/obj/NiObject.cpp
@@ -11,8 +11,12 @@ const Type NiObject::TYPE("NiObject", NULL );
 //Static to track total number of objects in memory.  Initialize to zero.
 unsigned int NiObject::objectsInMemory = 0;
 
-NiObject::NiObject() : _ref_count(0) {}
-NiObject::~NiObject() {}
+NiObject::NiObject() : _ref_count(0) {
+	objectsInMemory++;
+}
+NiObject::~NiObject() {
+	objectsInMemory--;
+}
 
 bool NiObject::IsSameType( const Type & compare_to) const {
 	return GetType().IsSameType( compare_to );
@@ -35,7 +39,9 @@ void NiObject::AddRef() const {
 }
 
 void NiObject::SubtractRef() const {
-	if ( _ref_count-- == 0 ) {
+	_ref_count--;
+	if ( _ref_count < 1 ) {
+		//cout << this->GetIDString() << " died." << endl;
 		delete this;
 	}
 }
@@ -59,7 +65,7 @@ list<NiObjectRef> NiObject::GetRefs() const {
 }
 
 /*! Used to format a human readable string that includes the type of the object */
-string NiObject::GetIDString() {
+string NiObject::GetIDString() const {
 	stringstream out;
 	out << this << "(" << this->GetType().GetTypeName() << ")";
 	return out.str();
diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp
index 9d3b7abc5ceb539450f23ba0012baa213d124859..697609ae531ec38bab8ebd1a68a34a9ad61fee17 100644
--- a/src/obj/NiSkinInstance.cpp
+++ b/src/obj/NiSkinInstance.cpp
@@ -47,8 +47,18 @@ NiSkinInstance::NiSkinInstance( Ref<NiNode> skeleton_root, vector< Ref<NiNode> >
 }
 
 NiSkinInstance::~NiSkinInstance() {
+	//Probably not necessary, and not very safe
+	////Unflag any bones that were part of this skin instance
+	//for ( uint i = 0; i < bones.size(); ++i ) {
+	//	cout << "Bone " << i << ":";
+	//	cout << bones[i]->GetIDString() << endl;
+	//	bones[i]->SetSkinFlag(false);
+	//}
+
 	//Inform Skeleton Root of detatchment and clear it.
-	skeletonRoot->RemoveSkin( this );
+	if ( skeletonRoot != NULL ) {
+		skeletonRoot->RemoveSkin( this );
+	}
 }
 
 void NiSkinInstance::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {