some minor tweaks
more setup