r? fixes (mostly style)