yet more setup tweaks