Added more tokens as well fixed keywords array.

It now supports for multiple keywords representing one token. It used to
allow a single keyword to represent multiple tokens, which is unlogical.