cleaned up joints a bit to fix crash