fixes to conditionals