Grammar cleanup

Fixing how the v2 parser handles new lines, comments and spaces in strings