Refactored general_skeleton and _joint.