correct %-op
correct expression of logical and relation
add TRUE and FALSE