refresh a few cherry picks

and clean up a tad