fix and add other kind of keywords