Added new toggles!
Update README.md

Edit BNF to reflect changes
Merge pull request #7 from t3kk/master

More tweaks!