Minor adaptions in tracker, mainly conversion from DE to p_increment.