update TODO and reserverd word logic.