tweaks to conditionals