Updating comparators to return extra data
Improved duration estimates
Fixed sorting to inject top wittl data