Improved some entities.