Fixed the BNF grammar

Minor updates