new entity, few fixes