improves binary operator expression converter and adds many cases