Polish up joint adding a little bit, fix some edge cases