fix a TODO in the code and make keyword always an object