Add new joint groups

And cleanup so joint names are only written once.