sw logic tweaks