feat: sintax improvements, new grammar support and more test cases