Bestof and other fixes