added several more operators including and if conditional