More manual tweaks