more setup tweaks