fix entity generation
NewHeuristicAdder fixes