some fixes and new joints