Some fixes in track finding and fitting