diff --git a/RigidBody.h b/RigidBody.h
index dd71ebed4f61e50b7d21a31a59be4f26c0adc78a..b6df0612475857b783c89f93c6a8f05b2671e1c5 100644
--- a/RigidBody.h
+++ b/RigidBody.h
@@ -40,7 +40,7 @@ class RigidBody { // host side representation of rigid bodies
 
 	// HOST DEVICE void integrate(Vector3& old_trans, Matrix3& old_rot, int startFinishAll);
 	// HOST DEVICE void integrate(Vector3& old_trans, Matrix3& old_rot, int startFinishAll);
-	HOST DEVICE void integrate(int startFinishAll);
+	void integrate(int startFinishAll);
 	
 	// HOST DEVICE inline String getKey() const { return key; }
 	// HOST DEVICE inline String getKey() const { return t->name; }
diff --git a/RigidBodyController.h b/RigidBodyController.h
index 76b270c35415d41c141665973d85716c3643e062..a4a4f446b672f1404c84572ba56a683762888f60 100644
--- a/RigidBodyController.h
+++ b/RigidBodyController.h
@@ -6,7 +6,7 @@
 #include <cuda_runtime.h>
 
 // #define NUMTHREADS 128					/* try with 64, every 32+ */
-#define NUMTHREADS 64
+#define NUMTHREADS 96
 #define NUMSTREAMS 8
 
 class Configuration;
@@ -46,8 +46,6 @@ private:
 	
 	static const int numThreads = NUMTHREADS;
 	
-	bool isPmf;
-	
 	RigidBodyType* type1;
 	RigidBodyType* type2;
 	RigidBody* rb1;
@@ -56,6 +54,8 @@ private:
 	std::vector<int> gridKeyId1;
 	std::vector<int> gridKeyId2;
 	std::vector<int> numBlocks;
+
+	bool isPmf;
 	
 	std::vector<Vector3*> forces;
 	std::vector<Vector3*> forces_d;
diff --git a/RigidBodyType.h b/RigidBodyType.h
index b141035d6a853bc1da14ada5fbc3b243bad08551..4b793234afd950cb016dbd09da80d2451dda2551 100644
--- a/RigidBodyType.h
+++ b/RigidBodyType.h
@@ -35,8 +35,8 @@ public:
 RigidBodyType(const String& name = "") :
 	name(name), num(0),
 	reservoir(NULL), mass(1.0f), inertia(), transDamping(),
-	rotDamping(), numPotGrids(0), numDenGrids(0), numPmfs(0),
-	initPos(), initRot(Matrix3(1.0f))  { }
+	rotDamping(), initPos(), initRot(Matrix3(1.0f)),
+	numPotGrids(0), numDenGrids(0), numPmfs(0) { }
 	
 	/* RigidBodyType(const RigidBodyType& src) { copy(src); } */
 	~RigidBodyType() { clear(); }