Add several AST nodes
Fix several grammar rules