fixed entity, added translations