if statements fixed else; passes test1-4