added logical expressions, finished binary operators