Added algs to 70 distance tracker
Updated stuff and fixed resolve conflicts