updates some conditionals