renamed all keywords KW_KEYWORD, added number conversion