Added support for the ternary operator
Updated the description of some tokens