Bunch of misc rST fixes