fix some fb entities, add features to extended lifetime token