Fix encoding issues, style up the joint.
More updates