few more manual tweaks