Will - fixed sorting, a few other tweaks