many entities bug fixed