fixed more entity problems