EntityPrototype preliminaries, various improvements