minor entity changes

I still need them checked, some need more modifications, but they at
least look somewhat correct