Adding changes to parser v2 and v3

Parser v2 has an error with q(a,b).
Parser v3 is not implemented yet.