some entitedit improvements