improved some entities