Attempts to make the joint tracker better. Also added a test script.