got rid of else-less if statements, fixed assign, fixed bool evals in if statements