bugfix: else clause was failing
Conditionals working, fixed some bugs, added test cases