added operator parsing (need fix)