deploy
entities fixes