Finished grammar for the simple calculator
Minor changes.