fix entities
more entities