various ongoing tweaks