Fixed some bugs about keywords, etc