Fix bug yielding to sub-optimal solutions
Fix path-swapper bug
Fix W + smax and APX stats report