final #/setup tweaks