Fixed lap count issues I guess