added more tokens and keywords