action logic tweaks