[RFC] adjustments various