Tidying up rigid body stuff for svn commit