174 fix variables and conditionals