tweaks to conditionals re elif