misc fixes, still debuging joint fitter, it works almost