Added more features + fixed evaluation of logical forms