new joints fixes #15 and fixes #16