fixed entities and stuff
fixed stuff