feat: parser grammar and sintax improvements