added more operators
fixed conflict