More useful tweaks

and other far less useful ...