Track finding am sv 270214

Latest update, making some fixes to the baseline code